when extending the draw rectangle by the "draw-border" style property,

2008-09-04  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkwidget.c (gtk_widget_get_draw_rectangle): when extending
	the draw rectangle by the "draw-border" style property, subtract
	"left" from "x" and "top" from "y", not the other way around.

svn path=/trunk/; revision=21285

diff --git a/ChangeLog b/ChangeLog
index 20f96c6c305a1ddb6670f3e1ae36d35df4a1e73d..4fe896e4f0a5149768772baaac96d8453b5b0188 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-04  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkwidget.c (gtk_widget_get_draw_rectangle): when extending
+       the draw rectangle by the "draw-border" style property, subtract
+       "left" from "x" and "top" from "y", not the other way around.
+
 2008-09-03  Matthias Clasen  <mclasen@redhat.com>
        
        * gdk/gdkwindow.c:

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 597ecd7410343a26acf076792c282d43010c2675..79a0f48bb16239d3b43f8fcabd8a69f359e0505b 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -3493,13 +3493,13 @@ gtk_widget_get_draw_rectangle (GtkWidget    *widget,
 
       *rect = widget->allocation;
 
-      gtk_widget_style_get (widget, 
+      gtk_widget_style_get (widget,
                            "draw-border", &draw_border,
                            NULL);
       if (draw_border)
        {
-         rect->x -= draw_border->top;
-         rect->y -= draw_border->left;
+         rect->x -= draw_border->left;
+         rect->y -= draw_border->top;
          rect->width += draw_border->left + draw_border->right;
          rect->height += draw_border->top + draw_border->bottom;